Autogenerated HTML docs for v1.5.0-50-gb7581
diff --git a/git-rerere.html b/git-rerere.html index 2a2beef..c279b3b 100644 --- a/git-rerere.html +++ b/git-rerere.html
@@ -437,8 +437,7 @@ out to your working tree file, so you would not have to manually resolve it. Note that <tt>git-rerere</tt> leaves the index file alone, so you still need to do the final sanity checks with <tt>git diff</tt> -(or <tt>git diff -c</tt>) and <tt>git update-index</tt> when you are -satisfied.</p> +(or <tt>git diff -c</tt>) and <tt>git add</tt> when you are satisfied.</p> <p>As a convenience measure, <tt>git-merge</tt> automatically invokes <tt>git-rerere</tt> when it exits with a failed automerge, which records it if it is a new conflict, or reuses the earlier hand @@ -482,7 +481,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 19-Jan-2007 00:37:32 UTC +Last updated 18-Feb-2007 00:34:42 UTC </div> </div> </body>
